From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 29 Mar 2010 14:00:56 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~88
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2b81de8fa7faa5f4ecae56b7cb65ae0c2f495688;p=emacs.git

Merge from mainline.
---

2b81de8fa7faa5f4ecae56b7cb65ae0c2f495688